From dcfac2c69cb04ba5a3aa5fc1abd858cb5dff160b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 10 Jan 2006 04:33:30 +0000 Subject: [PATCH] Make this function public API. (#307099, Todd Berman) 2006-01-09 Matthias Clasen * gtk/gtk.symbols: * gtk/gtkwindow.h: * gtk/gtkwindow.c (gtk_window_get_group): Make this function public API. (#307099, Todd Berman) * gtk/gtkmenu.c: * gtk/gtkmain.c: * gtk/gtkentrycompletion.c: * gtk/gtkcombo.c: * gtk/gtkcombobox.c: Update all callers. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ docs/reference/ChangeLog | 3 ++- docs/reference/gtk/gtk-sections.txt | 1 + gtk/gtk.symbols | 1 + gtk/gtkcombo.c | 4 ++-- gtk/gtkcombobox.c | 4 ++-- gtk/gtkentrycompletion.c | 2 +- gtk/gtkmain.c | 6 +++--- gtk/gtkmenu.c | 6 +++--- gtk/gtkwindow.c | 16 +++++++++++++--- gtk/gtkwindow.h | 2 +- 12 files changed, 51 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 005dac3a91..2456fe7495 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2006-01-09 Matthias Clasen + * gtk/gtk.symbols: + * gtk/gtkwindow.h: + * gtk/gtkwindow.c (gtk_window_get_group): Make this function + public API. (#307099, Todd Berman) + + * gtk/gtkmenu.c: + * gtk/gtkmain.c: + * gtk/gtkentrycompletion.c: + * gtk/gtkcombo.c: + * gtk/gtkcombobox.c: Update all callers. + * gtk/gtkentry.c (paste_received): Make GtkEntryCompletion complete on pastes at the end. (#165714, Christian Neumair) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 005dac3a91..2456fe7495 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,16 @@ 2006-01-09 Matthias Clasen + * gtk/gtk.symbols: + * gtk/gtkwindow.h: + * gtk/gtkwindow.c (gtk_window_get_group): Make this function + public API. (#307099, Todd Berman) + + * gtk/gtkmenu.c: + * gtk/gtkmain.c: + * gtk/gtkentrycompletion.c: + * gtk/gtkcombo.c: + * gtk/gtkcombobox.c: Update all callers. + * gtk/gtkentry.c (paste_received): Make GtkEntryCompletion complete on pastes at the end. (#165714, Christian Neumair) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 3c8e92767d..f40f58a713 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,6 +1,7 @@ 2006-01-09 Matthias Clasen - * gtk/gtk-sections.txt: Add gtk_widget_get_action + * gtk/gtk-sections.txt: Add gtk_widget_get_action, + gtk_window_get_group 2005-12-30 Matthias Clasen diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index e02cb5e56d..2e043e571d 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -4831,6 +4831,7 @@ gtk_window_get_skip_pager_hint gtk_window_get_urgency_hint gtk_window_get_accept_focus gtk_window_get_focus_on_map +gtk_window_get_group gtk_window_move gtk_window_parse_geometry gtk_window_reshow_with_initial_size diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 567d9ff6f9..3fcf11f180 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -3962,6 +3962,7 @@ gtk_window_get_focus gtk_window_get_focus_on_map gtk_window_get_frame_dimensions gtk_window_get_gravity +gtk_window_get_group gtk_window_get_has_frame gtk_window_get_icon gtk_window_get_icon_list diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index c614e8ec86..a5b7b17a7c 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -562,7 +562,7 @@ gtk_combo_popup_list (GtkCombo *combo) if (GTK_IS_WINDOW (toplevel)) { - gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)), + gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (combo->popwin)); } @@ -594,7 +594,7 @@ gtk_combo_popdown_list (GtkCombo *combo) gtk_widget_hide (combo->popwin); - gtk_window_group_add_window (_gtk_window_get_group (NULL), GTK_WINDOW (combo->popwin)); + gtk_window_group_add_window (gtk_window_get_group (NULL), GTK_WINDOW (combo->popwin)); } static gboolean diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 2a09ed1668..66fe8022fb 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1212,7 +1212,7 @@ gtk_combo_box_set_popup_widget (GtkComboBox *combo_box, toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box)); if (GTK_IS_WINDOW (toplevel)) - gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)), + gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (combo_box->priv->popup_window)); gtk_window_set_resizable (GTK_WINDOW (combo_box->priv->popup_window), FALSE); @@ -1698,7 +1698,7 @@ gtk_combo_box_popup (GtkComboBox *combo_box) toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box)); if (GTK_IS_WINDOW (toplevel)) - gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)), + gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (combo_box->priv->popup_window)); gtk_widget_show_all (combo_box->priv->popup_frame); diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index 77dd5d9287..c7c6a25366 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -1444,7 +1444,7 @@ _gtk_entry_completion_popup (GtkEntryCompletion *completion) toplevel = gtk_widget_get_toplevel (completion->priv->entry); if (GTK_IS_WINDOW (toplevel)) - gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)), + gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (completion->priv->popup_window)); /* prevent the first row being focused */ diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index ecc35906f6..d31dbce25f 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1477,9 +1477,9 @@ gtk_main_get_window_group (GtkWidget *widget) toplevel = gtk_widget_get_toplevel (widget); if (toplevel && GTK_IS_WINDOW (toplevel)) - return _gtk_window_get_group (GTK_WINDOW (toplevel)); + return gtk_window_get_group (GTK_WINDOW (toplevel)); else - return _gtk_window_get_group (NULL); + return gtk_window_get_group (NULL); } typedef struct @@ -1550,7 +1550,7 @@ gtk_grab_notify (GtkWindowGroup *group, GtkWindow *toplevel = toplevels->data; toplevels = g_list_delete_link (toplevels, toplevels); - if (group == _gtk_window_get_group (toplevel)) + if (group == gtk_window_get_group (toplevel)) gtk_container_foreach (GTK_CONTAINER (toplevel), gtk_grab_notify_foreach, &info); g_object_unref (toplevel); } diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 7ff90a8efd..06ac3cef96 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -1397,7 +1397,7 @@ gtk_menu_popup (GtkMenu *menu, toplevel = gtk_widget_get_toplevel (parent_menu_shell); if (GTK_IS_WINDOW (toplevel)) - gtk_window_group_add_window (_gtk_window_get_group (GTK_WINDOW (toplevel)), + gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (menu->toplevel)); } @@ -1479,7 +1479,7 @@ gtk_menu_popdown (GtkMenu *menu) /* The X Grab, if present, will automatically be removed when we hide * the window */ gtk_widget_hide (menu->toplevel); - gtk_window_group_add_window (_gtk_window_get_group (NULL), GTK_WINDOW (menu->toplevel)); + gtk_window_group_add_window (gtk_window_get_group (NULL), GTK_WINDOW (menu->toplevel)); if (menu->torn_off) { @@ -4424,7 +4424,7 @@ gtk_menu_grab_notify (GtkWidget *widget, GtkWidget *grab; toplevel = gtk_widget_get_toplevel (widget); - group = _gtk_window_get_group (GTK_WINDOW (toplevel)); + group = gtk_window_get_group (GTK_WINDOW (toplevel)); grab = _gtk_window_group_get_current_grab (group); if (!was_grabbed) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index e605f08bb7..c2a218ec40 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -7030,7 +7030,7 @@ gtk_window_group_add_window (GtkWindowGroup *window_group, if (window->group) gtk_window_group_remove_window (window->group, window); else - window_group_cleanup_grabs (_gtk_window_get_group (NULL), window); + window_group_cleanup_grabs (gtk_window_get_group (NULL), window); window->group = window_group; @@ -7062,10 +7062,20 @@ gtk_window_group_remove_window (GtkWindowGroup *window_group, g_object_unref (window); } -/* Return the group for the window or the default group +/** + * gtk_window_get_group: + * @window: a #GtkWindow, or %NULL + * + * Returns the group for @window or the default group, if + * @window is %NULL or if @window does not have an explicit + * window group. + * + * Returns: the #GtkWindowGroup for a window or the default group + * + * Since: 2.10 */ GtkWindowGroup * -_gtk_window_get_group (GtkWindow *window) +gtk_window_get_group (GtkWindow *window) { if (window && window->group) return window->group; diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 38e81fd8d0..884b250f5d 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -364,6 +364,7 @@ void gtk_window_get_position (GtkWindow *window, gint *root_y); gboolean gtk_window_parse_geometry (GtkWindow *window, const gchar *geometry); +GtkWindowGroup *gtk_window_get_group (GtkWindow *window); /* Ignore this unless you are writing a GUI builder */ void gtk_window_reshow_with_initial_size (GtkWindow *window); @@ -393,7 +394,6 @@ void _gtk_window_constrain_size (GtkWindow *window, gint height, gint *new_width, gint *new_height); -GtkWindowGroup *_gtk_window_get_group (GtkWindow *window); GtkWidget *_gtk_window_group_get_current_grab (GtkWindowGroup *window_group); void _gtk_window_set_has_toplevel_focus (GtkWindow *window, -- 2.30.2